From: Danny B <danny_b@users.mediawiki.org>
Date: Fri, 23 Jan 2009 03:39:11 +0000 (+0000)
Subject: * (bug 3043) - RSS feed link should have silly orange icon
X-Git-Tag: 1.31.0-rc.0~43304
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=08459136df758fc54e3a97c0c2d0faea5b456e28;p=lhc%2Fweb%2Fwiklou.git

* (bug 3043) - RSS feed link should have silly orange icon
** improved r46058, now works in all skins
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0cd4bf34e2..9ec4d136bd 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1455,7 +1455,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '200';
+$wgStyleVersion = '201';
 
 
 # Server-side caching:
diff --git a/includes/Skin.php b/includes/Skin.php
index 40b480d90e..be46fe857d 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1005,7 +1005,7 @@ END;
 		if( $wgOut->isSyndicated() ) {
 			foreach( $wgFeedClasses as $format => $class ) {
 				$feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
-				$s .= " | <a href=\"$feedurl\">{$format}</a>";
+				$s .= " | <a href=\"$feedurl\" class=\"feedlink\">{$format}</a>";
 			}
 		}
 		return $s;
diff --git a/skins/Modern.php b/skins/Modern.php
index e651562801..509af7123e 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -294,7 +294,7 @@ class ModernTemplate extends QuickTemplate {
 		if($this->data['feeds']) { ?>
 			<li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
 					?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
-					echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
+					echo htmlspecialchars($feed['href']) ?>" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
 					<?php } ?></li><?php
 		}
 
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 071e07957c..f891996453 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -296,7 +296,7 @@ class MonoBookTemplate extends QuickTemplate {
 		if($this->data['feeds']) { ?>
 			<li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
 					?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
-					echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
+					echo htmlspecialchars($feed['href']) ?>" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
 					<?php } ?></li><?php
 		}
 
diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css
index 11fc995b38..d3f8351290 100644
--- a/skins/common/common_rtl.css
+++ b/skins/common/common_rtl.css
@@ -46,3 +46,9 @@ table.filehistory th {
 html > body div#article ul {
 	display: table;
 }
+
+/* feed links */
+a.feedlink {
+	background: none;
+	padding-left: 0;
+}
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 7404a156b4..724b0f4e45 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -317,4 +317,10 @@ span.mw-revdelundel-link,
 strong.mw-revdelundel-link {
 	font-family: monospace;
 	font-size: smaller
-}
\ No newline at end of file
+}
+
+/* feed links */
+a.feedlink {
+	background: url("images/feed-icon.png") center left no-repeat;
+	padding-left: 16px;
+}
diff --git a/skins/modern/feed-icon.png b/skins/modern/feed-icon.png
deleted file mode 100644
index 7188fa23a8..0000000000
Binary files a/skins/modern/feed-icon.png and /dev/null differ
diff --git a/skins/modern/main.css b/skins/modern/main.css
index e24db9b1ac..80ef008c5b 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -162,12 +162,6 @@ textarea {
 	margin-top: .4em;
 }
 
-/* feed links */
-#feed-atom, #feed-rss {
-	background: url("feed-icon.png") center left no-repeat;
-	padding-left: 16px;
-}
-
 .portlet h5 {
 	padding: 0.1em 0 0.3em 1em;
 	margin: 0 0 0 0;
diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css
index 6967af27c6..d7aae76984 100644
--- a/skins/modern/rtl.css
+++ b/skins/modern/rtl.css
@@ -116,12 +116,6 @@ table.filehistory th {
 	padding: 0.1em 1em 0.3em 0;
 }
 
-/* feed links */
-#feed-atom, #feed-rss {
-	background: none;
-	padding-left: 0;
-}
-
 #p-cactions li {
 	float: right;
 }
diff --git a/skins/monobook/feed-icon.png b/skins/monobook/feed-icon.png
deleted file mode 100644
index 7188fa23a8..0000000000
Binary files a/skins/monobook/feed-icon.png and /dev/null differ
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 5f96a98e0d..63ce572cc7 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -900,12 +900,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
 	z-index: 3;
 }
 
-/* feed links */
-#feed-atom, #feed-rss {
-	background: url("feed-icon.png") center left no-repeat;
-	padding-left: 16px;
-}
-
 /* TODO: #t-iscite is only used by the Cite extension, come up with some
  * system which allows extensions to add to this file on the fly
  */
diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css
index 7f97cab20f..fbd5ab35ea 100644
--- a/skins/monobook/rtl.css
+++ b/skins/monobook/rtl.css
@@ -77,12 +77,6 @@ div.magnify,
 	right: 0;
 }
 
-/* feed links */
-#feed-atom, #feed-rss {
-	background: none;
-	padding-left: 0;
-}
-
 #p-cactions {
 	left: auto;
 	right: 11.5em;
diff --git a/skins/simple/main.css b/skins/simple/main.css
index 6f3e8eb8ef..6ba47e0dcd 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -175,6 +175,12 @@ input.searchButton {
     padding: 0.5em 0.4em 0.4em 0.4em;
 }
 
+/* feed links */
+a.feedlink {
+	background: url("../common/images/feed-icon.png") center left no-repeat;
+	padding-left: 16px;
+}
+
 textarea {
   width: 100%;
 }
diff --git a/skins/simple/rtl.css b/skins/simple/rtl.css
index 1ba1431df0..1c72597048 100644
--- a/skins/simple/rtl.css
+++ b/skins/simple/rtl.css
@@ -71,6 +71,12 @@ div.magnify,
 	right: 0;
 }
 
+/* feed links */
+a.feedlink {
+	background: none;
+	padding-left: 0;
+}
+
 /* Fix margins for non-css2 browsers */
 /* top right bottom left */